gdk: gdk_drawable_get_display() => gdk_window_get_display()

diff --git a/gdk/gdkdevice.c b/gdk/gdkdevice.c
index 8e4794907716a228422f510febcb79167330ce49..7a98f6fb0b07d668d08f6197862db4262fd9cc7f 100644 (file)
--- a/gdk/gdkdevice.c
+++ b/gdk/gdkdevice.c
@@ -1060,7 +1060,7 @@ gdk_device_grab (GdkDevice        *device,
       GdkDisplay *display;
       gulong serial;
 
-      display = gdk_drawable_get_display (window);
+      display = gdk_window_get_display (window);
       serial = _gdk_windowing_window_get_next_serial (display);
 
       _gdk_display_add_device_grab (display,

diff --git a/gdk/gdkdisplay.c b/gdk/gdkdisplay.c
index e74f74e455606481c674265e32f3c5687f242cb7..39ccd25db2e570a752c98e93d0af1fbe476c997e 100644 (file)
--- a/gdk/gdkdisplay.c
+++ b/gdk/gdkdisplay.c
@@ -1107,7 +1107,7 @@ singlehead_default_window_get_pointer (GdkWindow       *window,
 {
   GdkDisplay *display;
 
-  display = gdk_drawable_get_display (window);
+  display = gdk_window_get_display (window);
 
   return gdk_window_real_window_get_device_position (display,
                                                      display->core_pointer,

diff --git a/gdk/gdkevents.c b/gdk/gdkevents.c
index 14330ca7da7259cfbd1e00a94f0d6144d1ae048c..f44a658f0d0d3c652a421acaaf104c16dc86a50f 100644 (file)
--- a/gdk/gdkevents.c
+++ b/gdk/gdkevents.c
@@ -319,7 +319,7 @@ gdk_event_put (const GdkEvent *event)
   g_return_if_fail (event != NULL);
 
   if (event->any.window)
-    display = gdk_drawable_get_display (event->any.window);
+    display = gdk_window_get_display (event->any.window);
   else
     {
       GDK_NOTE (MULTIHEAD,
@@ -1040,9 +1040,9 @@ gdk_event_get_device (const GdkEvent *event)
                    "It is most likely synthesized outside Gdk/GTK+\n",
                    event->type);
 
-        display = gdk_drawable_get_display (event->any.window);
+        display = gdk_window_get_display (event->any.window);
         device_manager = gdk_display_get_device_manager (display);
-        core_pointer = gdk_device_manager_get_client_pointer (device_manager);
+        core_pointer = gdk_display_get_core_pointer (display);
 
         if (event->type == GDK_KEY_PRESS ||
             event->type == GDK_KEY_RELEASE)
@@ -1090,7 +1090,7 @@ gdk_event_request_motions (const GdkEventMotion *event)
     {
       gdk_device_get_state (event->device, event->window, NULL, NULL);
       
-      display = gdk_drawable_get_display (event->window);
+      display = gdk_window_get_display (event->window);
       _gdk_display_enable_motion_hints (display, event->device);
     }
 }
@@ -1449,7 +1449,7 @@ gdk_synthesize_window_state (GdkWindow     *window,
     {
     case GDK_WINDOW_TOPLEVEL:
     case GDK_WINDOW_TEMP: /* ? */
-      gdk_display_put_event (gdk_drawable_get_display (window), &temp_event);
+      gdk_display_put_event (gdk_window_get_display (window), &temp_event);
       break;
       
     case GDK_WINDOW_FOREIGN:

diff --git a/gdk/gdkoffscreenwindow.c b/gdk/gdkoffscreenwindow.c
index 13c78e7343df16f25cd6e279f5e56255849135e7..78b92d5077c98a8b634d3a31df012af62f747acb 100644 (file)
--- a/gdk/gdkoffscreenwindow.c
+++ b/gdk/gdkoffscreenwindow.c
@@ -498,7 +498,7 @@ gdk_offscreen_window_hide (GdkWindow *window)
   offscreen = GDK_OFFSCREEN_WINDOW (private->impl);
 
   /* May need to break grabs on children */
-  display = gdk_drawable_get_display (window);
+  display = gdk_window_get_display (window);
 
   /* TODO: This needs updating to the new grab world */
 #if 0

diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c
index 9dc21bcc5873ff82df3fcfedb48780e7d7394692..0da0fbf45bace5d30d63698dcf9644e2d11715b5 100644 (file)
--- a/gdk/gdkwindow.c
+++ b/gdk/gdkwindow.c
@@ -509,7 +509,7 @@ gdk_window_finalize (GObject *object)
   GdkWindowObject *obj = (GdkWindowObject *) object;
   GdkDeviceManager *device_manager;
 
-  device_manager = gdk_display_get_device_manager (gdk_drawable_get_display (GDK_DRAWABLE (window)));
+  device_manager = gdk_display_get_device_manager (gdk_window_get_display (window));
   g_signal_handlers_disconnect_by_func (device_manager, device_removed_cb, window);
 
   if (!GDK_WINDOW_DESTROYED (window))
@@ -1426,7 +1426,7 @@ gdk_window_new (GdkWindow     *parent,
   private->device_cursor = g_hash_table_new_full (NULL, NULL, NULL,
                                                   (GDestroyNotify) gdk_cursor_unref);
 
-  device_manager = gdk_display_get_device_manager (gdk_drawable_get_display (GDK_DRAWABLE (parent)));
+  device_manager = gdk_display_get_device_manager (gdk_window_get_display (parent));
   g_signal_connect (device_manager, "device-removed",
                     G_CALLBACK (device_removed_cb), window);
 
@@ -1937,7 +1937,7 @@ _gdk_window_destroy_hierarchy (GdkWindow *window,
   if (GDK_WINDOW_DESTROYED (window))
     return;
 
-  display = gdk_drawable_get_display (GDK_DRAWABLE (window));
+  display = gdk_window_get_display (window);
   screen = gdk_window_get_screen (window);
   temp_window = g_object_get_qdata (G_OBJECT (screen), quark_pointer_window);
   if (temp_window == window)
@@ -4077,7 +4077,7 @@ gdk_window_process_updates_internal (GdkWindow *window)
          if (debug_updates)
            {
              /* Make sure we see the red invalid area before redrawing. */
-             gdk_display_sync (gdk_drawable_get_display (window));
+             gdk_display_sync (gdk_window_get_display (window));
              g_usleep (70000);
            }
 
@@ -5077,7 +5077,7 @@ gdk_window_get_pointer (GdkWindow   *window,
 
   g_return_val_if_fail (GDK_IS_WINDOW (window), NULL);
 
-  display = gdk_drawable_get_display (window);
+  display = gdk_window_get_display (window);
 
   return gdk_window_get_device_position (window, display->core_pointer, x, y, mask);
 }
@@ -5115,7 +5115,7 @@ gdk_window_get_device_position (GdkWindow       *window,
   g_return_val_if_fail (GDK_IS_WINDOW (window), NULL);
   g_return_val_if_fail (GDK_IS_DEVICE (device), NULL);
 
-  display = gdk_drawable_get_display (window);
+  display = gdk_window_get_display (window);
   child = display->device_hooks->window_get_device_position (display, device, window,
                                                              &tmp_x, &tmp_y, &tmp_mask);
 
@@ -5802,7 +5802,7 @@ gdk_window_hide (GdkWindow *window)
       GList *devices, *d;
 
       /* May need to break grabs on children */
-      display = gdk_drawable_get_display (window);
+      display = gdk_window_get_display (window);
       device_manager = gdk_display_get_device_manager (display);
 
       /* Get all devices */
@@ -5924,7 +5924,7 @@ gdk_window_set_events (GdkWindow       *window,
     return;
 
   /* If motion hint is disabled, enable motion events again */
-  display = gdk_drawable_get_display (window);
+  display = gdk_window_get_display (window);
   if ((private->event_mask & GDK_POINTER_MOTION_HINT_MASK) &&
       !(event_mask & GDK_POINTER_MOTION_HINT_MASK))
     {
@@ -6004,7 +6004,7 @@ gdk_window_set_device_events (GdkWindow    *window,
   private = (GdkWindowObject *) window;
 
   /* If motion hint is disabled, enable motion events again */
-  display = gdk_drawable_get_display (window);
+  display = gdk_window_get_display (window);
   if ((private->event_mask & GDK_POINTER_MOTION_HINT_MASK) &&
       !(event_mask & GDK_POINTER_MOTION_HINT_MASK))
     _gdk_display_enable_motion_hints (display, device);
@@ -6837,7 +6837,7 @@ gdk_window_set_cursor (GdkWindow *window,
   g_return_if_fail (GDK_IS_WINDOW (window));
 
   private = (GdkWindowObject *) window;
-  display = gdk_drawable_get_display (window);
+  display = gdk_window_get_display (window);
 
   if (private->cursor)
     {
@@ -6915,7 +6915,7 @@ gdk_window_set_device_cursor (GdkWindow *window,
   g_return_if_fail (GDK_IS_DEVICE (device));
 
   private = (GdkWindowObject *) window;
-  display = gdk_drawable_get_display (window);
+  display = gdk_window_get_display (window);
 
   if (!cursor)
     g_hash_table_remove (private->device_cursor, device);
@@ -7628,7 +7628,7 @@ gdk_window_set_composited (GdkWindow *window,
   if (composited)
     gdk_window_ensure_native (window);
 
-  display = gdk_drawable_get_display (GDK_DRAWABLE (window));
+  display = gdk_window_get_display (window);
 
   if (!gdk_display_supports_composite (display) && composited)
     {
@@ -7884,7 +7884,7 @@ _gdk_window_add_damage (GdkWindow *toplevel,
   event.expose.send_event = FALSE;
   event.expose.region = damaged_region;
   cairo_region_get_extents (event.expose.region, &event.expose.area);
-  display = gdk_drawable_get_display (event.expose.window);
+  display = gdk_window_get_display (event.expose.window);
   _gdk_event_queue_append (display, gdk_event_copy (&event));
 }
 
@@ -8204,7 +8204,7 @@ gdk_window_beep (GdkWindow *window)
     return;
 
   toplevel = get_event_toplevel (window);
-  display = gdk_drawable_get_display (GDK_DRAWABLE (window));
+  display = gdk_window_get_display (window);
 
   if (toplevel && !gdk_window_is_offscreen ((GdkWindowObject *)toplevel))
     _gdk_windowing_window_beep (toplevel);
@@ -8478,12 +8478,12 @@ _gdk_make_event (GdkWindow    *window,
   if (event_in_queue)
     {
     if (before_event)
-      _gdk_event_queue_insert_before (gdk_drawable_get_display (window), event_in_queue, event);
+      _gdk_event_queue_insert_before (gdk_window_get_display (window), event_in_queue, event);
     else
-      _gdk_event_queue_insert_after (gdk_drawable_get_display (window), event_in_queue, event);
+      _gdk_event_queue_insert_after (gdk_window_get_display (window), event_in_queue, event);
     }
   else
-    _gdk_event_queue_append (gdk_drawable_get_display (window), event);
+    _gdk_event_queue_append (gdk_window_get_display (window), event);
 
   return event;
 }
@@ -8899,7 +8899,7 @@ gdk_pointer_grab (GdkWindow *       window,
       native = gdk_window_get_toplevel (native);
     }
 
-  display = gdk_drawable_get_display (window);
+  display = gdk_window_get_display (window);
 
   serial = _gdk_windowing_window_get_next_serial (display);
   device_manager = gdk_display_get_device_manager (display);
@@ -9004,7 +9004,7 @@ gdk_keyboard_grab (GdkWindow *window,
       native = gdk_window_get_toplevel (native);
     }
 
-  display = gdk_drawable_get_display (window);
+  display = gdk_window_get_display (window);
 
   serial = _gdk_windowing_window_get_next_serial (display);
   device_manager = gdk_display_get_device_manager (display);
@@ -9081,7 +9081,7 @@ do_synthesize_crossing_event (gpointer data)
   if (GDK_WINDOW_DESTROYED (changed_toplevel))
     return FALSE;
 
-  display = gdk_drawable_get_display (changed_toplevel);
+  display = gdk_window_get_display (changed_toplevel);
   serial = _gdk_windowing_window_get_next_serial (display);
   g_hash_table_iter_init (&iter, display->pointers_info);
 
@@ -9131,7 +9131,7 @@ _gdk_synthesize_crossing_events_for_geometry_change (GdkWindow *changed_window)
   if (_gdk_native_windows)
     return; /* We use the native crossing events if all native */
 
-  display = gdk_drawable_get_display (changed_window);
+  display = gdk_window_get_display (changed_window);
 
   toplevel = get_event_toplevel (changed_window);
   toplevel_priv = (GdkWindowObject *) toplevel;
@@ -9442,7 +9442,7 @@ proxy_button_event (GdkEvent *source_event,
   gdk_event_get_state (source_event, &state);
   time_ = gdk_event_get_time (source_event);
   device = gdk_event_get_device (source_event);
-  display = gdk_drawable_get_display (source_event->any.window);
+  display = gdk_window_get_display (source_event->any.window);
   toplevel_window = convert_native_coords_to_toplevel (event_window,
                                                       toplevel_x, toplevel_y,
                                                       &toplevel_x, &toplevel_y);
@@ -9900,7 +9900,7 @@ _gdk_window_get_input_window_for_event (GdkWindow *native_window,
   toplevel_x = x;
   toplevel_y = y;
 
-  display = gdk_drawable_get_display (native_window);
+  display = gdk_window_get_display (native_window);
   toplevel_window = convert_native_coords_to_toplevel (native_window,
                                                       toplevel_x, toplevel_y,
                                                       &toplevel_x, &toplevel_y);

diff --git a/gdk/quartz/gdkdevice-core.c b/gdk/quartz/gdkdevice-core.c
index 33e6a408b4b4a66c26e913a522a99bc66c53bcb6..6397cf4b3893c767a3e39339a1c29ab09252d967 100644 (file)
--- a/gdk/quartz/gdkdevice-core.c
+++ b/gdk/quartz/gdkdevice-core.c
@@ -268,7 +268,7 @@ gdk_device_core_query_state (GdkDevice        *device,
   if (!found_window)
     return FALSE;
 
-  display = gdk_drawable_get_display (window);
+  display = gdk_window_get_display (window);
 
   if (root_window)
     *root_window = _gdk_root;

diff --git a/gdk/quartz/gdkevents-quartz.c b/gdk/quartz/gdkevents-quartz.c
index 28807b8059a4347a3e7f6552f3056f6b1dab30dd..2f8b0c8c1bc4b25b221e6bf03235f95990c96b46 100644 (file)
--- a/gdk/quartz/gdkevents-quartz.c
+++ b/gdk/quartz/gdkevents-quartz.c
@@ -366,7 +366,7 @@ generate_motion_event (GdkWindow *window)
   nswindow = ((GdkWindowImplQuartz *)private->impl)->toplevel;
   view = (GdkQuartzView *)[nswindow contentView];
 
-  display = gdk_drawable_get_display (window);
+  display = gdk_window_get_display (window);
 
   screen_point = [NSEvent mouseLocation];
 
@@ -540,7 +540,7 @@ find_toplevel_for_keyboard_event (NSEvent *nsevent)
   view = (GdkQuartzView *)[[nsevent window] contentView];
   window = [view gdkWindow];
 
-  display = gdk_drawable_get_display (GDK_DRAWABLE (window));
+  display = gdk_window_get_display (window);
 
   device_manager = gdk_display_get_device_manager (display);
   list = gdk_device_manager_list_devices (device_manager,
@@ -583,7 +583,7 @@ find_toplevel_for_mouse_event (NSEvent    *nsevent,
   view = (GdkQuartzView *)[[nsevent window] contentView];
   toplevel = [view gdkWindow];
 
-  display = gdk_drawable_get_display (toplevel);
+  display = gdk_window_get_display (toplevel);
   private = GDK_WINDOW_OBJECT (toplevel);
 
   event_type = [nsevent type];

diff --git a/gdk/quartz/gdkwindow-quartz.c b/gdk/quartz/gdkwindow-quartz.c
index 538753b84cfc9b9dc2476d637232f605f896f17e..67de51a48a244519b1615ee3e073c3400868fe43 100644 (file)
--- a/gdk/quartz/gdkwindow-quartz.c
+++ b/gdk/quartz/gdkwindow-quartz.c
@@ -145,7 +145,7 @@ static void
 check_grab_unmap (GdkWindow *window)
 {
   GList *list, *l;
-  GdkDisplay *display = gdk_drawable_get_display (window);
+  GdkDisplay *display = gdk_window_get_display (window);
   GdkDeviceManager *device_manager;
 
   device_manager = gdk_display_get_device_manager (display);
@@ -163,7 +163,7 @@ static void
 check_grab_destroy (GdkWindow *window)
 {
   GList *list, *l;
-  GdkDisplay *display = gdk_drawable_get_display (window);
+  GdkDisplay *display = gdk_window_get_display (window);
   GdkDeviceManager *device_manager;
 
   /* Make sure there is no lasting grab in this native window */

diff --git a/gdk/win32/gdkdevicemanager-win32.c b/gdk/win32/gdkdevicemanager-win32.c
index f0fddb1b537fc22eb13dd97a4d31e8646ff63c78..6a7b6e71d8895b869ae1d257103d0fe18d6fe4b6 100644 (file)
--- a/gdk/win32/gdkdevicemanager-win32.c
+++ b/gdk/win32/gdkdevicemanager-win32.c
@@ -888,7 +888,7 @@ _gdk_input_other_event (GdkEvent  *event,
     window = _gdk_root;
 
   g_object_ref (window);
-  display = gdk_drawable_get_display (window);
+  display = gdk_window_get_display (window);
 
   GDK_NOTE (EVENTS_OR_INPUT,
            g_print ("_gdk_input_other_event: window=%p %+d%+d\n",

diff --git a/gdk/x11/gdkdevice-core.c b/gdk/x11/gdkdevice-core.c
index 7ff8c4d8a428f2afcae11dfcb6fea42ab68c2a2b..a947fec73b26bb5dc5290f00127afa8091ac0f15 100644 (file)
--- a/gdk/x11/gdkdevice-core.c
+++ b/gdk/x11/gdkdevice-core.c
@@ -248,7 +248,7 @@ gdk_device_core_query_state (GdkDevice        *device,
   int xroot_x, xroot_y, xwin_x, xwin_y;
   unsigned int xmask;
 
-  display = gdk_drawable_get_display (window);
+  display = gdk_window_get_display (window);
 
   if (!XQueryPointer (GDK_WINDOW_XDISPLAY (window),
                       GDK_WINDOW_XID (window),

diff --git a/gdk/x11/gdkdevice-xi2.c b/gdk/x11/gdkdevice-xi2.c
index d7bc64e66e92ca4ab33d5e701356feb83fea7660..f64896ca5e33cbc92394780d37ea386b3058f32c 100644 (file)
--- a/gdk/x11/gdkdevice-xi2.c
+++ b/gdk/x11/gdkdevice-xi2.c
@@ -307,7 +307,7 @@ gdk_device_xi2_query_state (GdkDevice        *device,
     return FALSE;
 
   priv = GDK_DEVICE_XI2 (device)->priv;
-  display = gdk_drawable_get_display (window);
+  display = gdk_window_get_display (window);
 
   if (!XIQueryPointer (GDK_WINDOW_XDISPLAY (window),
                        priv->device_id,

diff --git a/gdk/x11/gdkdevicemanager-xi.c b/gdk/x11/gdkdevicemanager-xi.c
index 7229b58b2d10a2bdf3c617a8bcc38ca42b7c02d6..28419b0c140805c60aaeac4584850869c0a0b7dc 100644 (file)
--- a/gdk/x11/gdkdevicemanager-xi.c
+++ b/gdk/x11/gdkdevicemanager-xi.c
@@ -453,7 +453,7 @@ gdk_device_manager_xi_translate_event (GdkEventTranslator *translator,
       event->button.button = xdbe->button;
 
       if (event->button.type == GDK_BUTTON_PRESS)
-       _gdk_event_button_generate (gdk_drawable_get_display (event->button.window),
+       _gdk_event_button_generate (gdk_window_get_display (event->button.window),
                                    event);
 
       GDK_NOTE (EVENTS,

diff --git a/gdk/x11/gdkdnd-x11.c b/gdk/x11/gdkdnd-x11.c
index a37ee986fc58acb3004e294888bcbf6a08d38955..3a889b72e19137e8b521d15b80928ce887001303 100644 (file)
--- a/gdk/x11/gdkdnd-x11.c
+++ b/gdk/x11/gdkdnd-x11.c
@@ -286,8 +286,8 @@ gdk_drag_context_find (GdkDisplay *display,
       context = (GdkDragContext *)tmp_list->data;
       private = PRIVATE_DATA (context);
 
-      if ((context->source_window && gdk_drawable_get_display (context->source_window) != display) ||
-         (context->dest_window && gdk_drawable_get_display (context->dest_window) != display))
+      if ((context->source_window && gdk_window_get_display (context->source_window) != display) ||
+         (context->dest_window && gdk_window_get_display (context->dest_window) != display))
        continue;
 
       context_dest_xid = context->dest_window ? 
@@ -1919,7 +1919,7 @@ motif_drag_status (GdkEvent *event,
   GDK_NOTE (DND, 
            g_message ("Motif status message: flags %x", flags));
 
-  display = gdk_drawable_get_display (event->any.window);
+  display = gdk_window_get_display (event->any.window);
   if (!display)
     return GDK_FILTER_REMOVE;
   
@@ -2137,7 +2137,7 @@ xdnd_status_filter (GdkXEvent *xev,
            g_message ("XdndStatus: dest_window: %#x  action: %ld",
                       dest_window, action));
 
-  display = gdk_drawable_get_display (event->any.window);
+  display = gdk_window_get_display (event->any.window);
   context = gdk_drag_context_find (display, TRUE, xevent->xclient.window, dest_window);
   
   if (context)
@@ -2186,7 +2186,7 @@ xdnd_finished_filter (GdkXEvent *xev,
   GDK_NOTE (DND, 
            g_message ("XdndFinished: dest_window: %#x", dest_window));
 
-  display = gdk_drawable_get_display (event->any.window);
+  display = gdk_window_get_display (event->any.window);
   context = gdk_drag_context_find (display, TRUE, xevent->xclient.window, dest_window);
   
   if (context)
@@ -3185,7 +3185,7 @@ gdk_drag_begin (GdkWindow     *window,
   
   new_context->actions = 0;
 
-  display = gdk_drawable_get_display (GDK_DRAWABLE (window));
+  display = gdk_window_get_display (window);
   device_manager = gdk_display_get_device_manager (display);
   device = gdk_device_manager_get_client_pointer (device_manager);
   gdk_drag_context_set_device (new_context, device);
@@ -3942,7 +3942,7 @@ gdk_window_register_dnd (GdkWindow      *window)
   static const gulong xdnd_version = 5;
   MotifDragReceiverInfo info;
   Atom motif_drag_receiver_info_atom;
-  GdkDisplay *display = gdk_drawable_get_display (window);
+  GdkDisplay *display = gdk_window_get_display (window);
 
   g_return_if_fail (window != NULL);
 

diff --git a/gdk/x11/gdkdrawable-x11.c b/gdk/x11/gdkdrawable-x11.c
index b1634f894711372403ed2e7d9f35c7ed3c5e643a..fda12997106ac8ab530fc19b8020e029ca829325 100644 (file)
--- a/gdk/x11/gdkdrawable-x11.c
+++ b/gdk/x11/gdkdrawable-x11.c
@@ -175,7 +175,7 @@ gdk_x11_drawable_get_xid (GdkDrawable *drawable)
           * this function returns. This is required because the returned XID
           * for this window must be valid immediately, even with another
           * connection to the Xserver */
-         gdk_display_sync (gdk_drawable_get_display (window));
+         gdk_display_sync (gdk_window_get_display (window));
        }
       
       if (!GDK_WINDOW_IS_X11 (window))

diff --git a/gdk/x11/gdkmain-x11.c b/gdk/x11/gdkmain-x11.c
index c71e189aa037ffd517eae7d6bdb15a3bb7a4d3ee..d55f66def096d5e710ebaaea439fcd1a8158e2a2 100644 (file)
--- a/gdk/x11/gdkmain-x11.c
+++ b/gdk/x11/gdkmain-x11.c
@@ -192,7 +192,7 @@ void
 _gdk_xgrab_check_unmap (GdkWindow *window,
                        gulong     serial)
 {
-  GdkDisplay *display = gdk_drawable_get_display (window);
+  GdkDisplay *display = gdk_window_get_display (window);
   GdkDeviceManager *device_manager;
   GList *devices, *d;
 
@@ -220,7 +220,7 @@ _gdk_xgrab_check_unmap (GdkWindow *window,
 void
 _gdk_xgrab_check_destroy (GdkWindow *window)
 {
-  GdkDisplay *display = gdk_drawable_get_display (window);
+  GdkDisplay *display = gdk_window_get_display (window);
   GdkDeviceManager *device_manager;
   GdkDeviceGrabInfo *grab;
   GList *devices, *d;

diff --git a/gdk/x11/gdkproperty-x11.c b/gdk/x11/gdkproperty-x11.c
index 5e8bbe40b91bced5934f41306ff92c658ea51dfd..55e114f22550b81d9bf2f2f4b47a5c73404b4df2 100644 (file)
--- a/gdk/x11/gdkproperty-x11.c
+++ b/gdk/x11/gdkproperty-x11.c
@@ -563,7 +563,7 @@ gdk_property_get (GdkWindow   *window,
   if (GDK_WINDOW_DESTROYED (window))
     return FALSE;
 
-  display = gdk_drawable_get_display (window);
+  display = gdk_window_get_display (window);
   xproperty = gdk_x11_atom_to_xatom_for_display (display, property);
   if (type == GDK_NONE)
     xtype = AnyPropertyType;
@@ -703,7 +703,7 @@ gdk_property_change (GdkWindow    *window,
 
   gdk_window_ensure_native (window);
 
-  display = gdk_drawable_get_display (window);
+  display = gdk_window_get_display (window);
   xproperty = gdk_x11_atom_to_xatom_for_display (display, property);
   xtype = gdk_x11_atom_to_xatom_for_display (display, type);
   xwindow = GDK_WINDOW_XID (window);

diff --git a/gdk/x11/gdkselection-x11.c b/gdk/x11/gdkselection-x11.c
index 7a8d91495b4253b4d5e04fb9e8e417bc375ad740..c9b71abeb71d0bece0318241ae49b551dc36217c 100644 (file)
--- a/gdk/x11/gdkselection-x11.c
+++ b/gdk/x11/gdkselection-x11.c
@@ -83,7 +83,7 @@ _gdk_selection_filter_clear_event (XSelectionClearEvent *event)
     {
       OwnerInfo *info = tmp_list->data;
 
-      if (gdk_drawable_get_display (info->owner) == display &&
+      if (gdk_window_get_display (info->owner) == display &&
          info->selection == gdk_x11_xatom_to_atom_for_display (display, event->selection))
        {
          if ((GDK_DRAWABLE_XID (info->owner) == event->window &&

diff --git a/gdk/x11/gdktestutils-x11.c b/gdk/x11/gdktestutils-x11.c
index 06e1c3697849e80c32de455cfc2adf2e5111826b..a66df584b6992867e64b7405ddcc4cd4169e107b 100644 (file)
--- a/gdk/x11/gdktestutils-x11.c
+++ b/gdk/x11/gdktestutils-x11.c
@@ -127,7 +127,7 @@ gdk_test_simulate_key (GdkWindow      *window,
   xev.y_root = 0;
   xev.state = modifiers;
   xev.keycode = 0;
-  success = gdk_keymap_get_entries_for_keyval (gdk_keymap_get_for_display (gdk_drawable_get_display (window)), keyval, &keys, &n_keys);
+  success = gdk_keymap_get_entries_for_keyval (gdk_keymap_get_for_display (gdk_window_get_display (window)), keyval, &keys, &n_keys);
   success &= n_keys > 0;
   if (success)
     {

diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c
index e7e8251297779c1954ac7113e6f394ce14c54ba5..14a1b577e59e190353b1c175d95cf62ea4064d2f 100644 (file)
--- a/gdk/x11/gdkwindow-x11.c
+++ b/gdk/x11/gdkwindow-x11.c
@@ -504,7 +504,7 @@ _gdk_windowing_window_init (GdkScreen * screen)
 static void
 set_wm_protocols (GdkWindow *window)
 {
-  GdkDisplay *display = gdk_drawable_get_display (window);
+  GdkDisplay *display = gdk_window_get_display (window);
   Atom protocols[4];
   int n = 0;
   
@@ -623,7 +623,7 @@ setup_toplevel_window (GdkWindow *window,
 {
   GdkWindowObject *obj = (GdkWindowObject *)window;
   GdkToplevelX11 *toplevel = _gdk_x11_window_get_toplevel (window);
-  GdkDisplay *display = gdk_drawable_get_display (window);
+  GdkDisplay *display = gdk_window_get_display (window);
   Display *xdisplay = GDK_WINDOW_XDISPLAY (window);
   XID xid = GDK_WINDOW_XID (window);
   GdkScreenX11 *screen_x11 = GDK_SCREEN_X11 (GDK_WINDOW_SCREEN (parent));
@@ -1354,7 +1354,7 @@ gdk_window_x11_show (GdkWindow *window, gboolean already_mapped)
       
   if (WINDOW_IS_TOPLEVEL (window))
     {
-      display = gdk_drawable_get_display (window);
+      display = gdk_window_get_display (window);
       display_x11 = GDK_DISPLAY_X11 (display);
       toplevel = _gdk_x11_window_get_toplevel (window);
       
@@ -1788,7 +1788,7 @@ move_to_current_desktop (GdkWindow *window)
       gulong *current_desktop;
       GdkDisplay *display;
       
-      display = gdk_drawable_get_display (window);
+      display = gdk_window_get_display (window);
 
       /* Get current desktop, then set it; this is a race, but not
        * one that matters much in practice.
@@ -1910,7 +1910,7 @@ gdk_window_set_type_hint (GdkWindow        *window,
       !WINDOW_IS_TOPLEVEL_OR_FOREIGN (window))
     return;
 
-  display = gdk_drawable_get_display (window);
+  display = gdk_window_get_display (window);
 
   switch (hint)
     {
@@ -1996,7 +1996,7 @@ gdk_window_get_type_hint (GdkWindow *window)
 
   type = GDK_WINDOW_TYPE_HINT_NORMAL;
 
-  display = gdk_drawable_get_display (window);
+  display = gdk_window_get_display (window);
 
   if (XGetWindowProperty (GDK_DISPLAY_XDISPLAY (display), GDK_WINDOW_XID (window),
                           gdk_x11_get_xatom_by_name_for_display (display, "_NET_WM_WINDOW_TYPE"),
@@ -2512,7 +2512,7 @@ gdk_window_set_title (GdkWindow   *window,
       !WINDOW_IS_TOPLEVEL_OR_FOREIGN (window))
     return;
   
-  display = gdk_drawable_get_display (window);
+  display = gdk_window_get_display (window);
   xdisplay = GDK_DISPLAY_XDISPLAY (display);
   xwindow = GDK_WINDOW_XID (window);
 
@@ -2556,7 +2556,7 @@ gdk_window_set_role (GdkWindow   *window,
 {
   GdkDisplay *display;
 
-  display = gdk_drawable_get_display (window);
+  display = gdk_window_get_display (window);
 
   if (GDK_WINDOW_DESTROYED (window) ||
       !WINDOW_IS_TOPLEVEL_OR_FOREIGN (window))
@@ -2590,7 +2590,7 @@ gdk_window_set_startup_id (GdkWindow   *window,
 
   g_return_if_fail (GDK_IS_WINDOW (window));
 
-  display = gdk_drawable_get_display (window);
+  display = gdk_window_get_display (window);
 
   if (GDK_WINDOW_DESTROYED (window) ||
       !WINDOW_IS_TOPLEVEL_OR_FOREIGN (window))
@@ -2903,7 +2903,7 @@ gdk_window_get_frame_extents (GdkWindow    *window,
 
   gdk_error_trap_push();
   
-  display = gdk_drawable_get_display (window);
+  display = gdk_window_get_display (window);
   xwindow = GDK_WINDOW_XID (window);
 
   /* first try: use _NET_FRAME_EXTENTS */
@@ -3106,7 +3106,7 @@ gdk_window_x11_get_device_state (GdkWindow       *window,
           int winy = 0;
           unsigned int xmask = 0;
 
-          _gdk_windowing_get_device_state (gdk_drawable_get_display (window), device,
+          _gdk_windowing_get_device_state (gdk_window_get_display (window), device,
                                            &screen, &rootx, &rooty, &xmask);
          gdk_window_get_origin (window, &originx, &originy);
          winx = rootx - originx;
@@ -3340,7 +3340,7 @@ gdk_window_x11_set_events (GdkWindow    *window,
       if (GDK_WINDOW_XID (window) != GDK_WINDOW_XROOTWIN (window))
         xevent_mask = StructureNotifyMask | PropertyChangeMask;
 
-      display_x11 = GDK_DISPLAY_X11 (gdk_drawable_get_display (window));
+      display_x11 = GDK_DISPLAY_X11 (gdk_window_get_display (window));
       gdk_event_source_select_events ((GdkEventSource *) display_x11->event_source,
                                       GDK_WINDOW_XWINDOW (window), event_mask,
                                       xevent_mask);
@@ -3625,7 +3625,7 @@ gdk_x11_window_set_user_time (GdkWindow *window,
       !WINDOW_IS_TOPLEVEL_OR_FOREIGN (window))
     return;
 
-  display = gdk_drawable_get_display (window);
+  display = gdk_window_get_display (window);
   display_x11 = GDK_DISPLAY_X11 (display);
   toplevel = _gdk_x11_window_get_toplevel (window);
 
@@ -3797,7 +3797,7 @@ gdk_window_set_icon_list (GdkWindow *window,
       !WINDOW_IS_TOPLEVEL_OR_FOREIGN (window))
     return;
 
-  display = gdk_drawable_get_display (window);
+  display = gdk_window_get_display (window);
   
   l = pixbufs;
   size = 0;
@@ -3917,7 +3917,7 @@ gdk_window_set_icon_name (GdkWindow   *window,
       !WINDOW_IS_TOPLEVEL_OR_FOREIGN (window))
     return;
 
-  display = gdk_drawable_get_display (window);
+  display = gdk_window_get_display (window);
 
   g_object_set_qdata (G_OBJECT (window), g_quark_from_static_string ("gdk-icon-name-set"),
                       GUINT_TO_POINTER (name != NULL));
@@ -4390,7 +4390,7 @@ gdk_window_set_group (GdkWindow *window,
   toplevel = _gdk_x11_window_get_toplevel (window);
 
   if (leader == NULL)
-    leader = gdk_display_get_default_group (gdk_drawable_get_display (window));
+    leader = gdk_display_get_default_group (gdk_window_get_display (window));
   
   if (toplevel->group_leader != leader)
     {
@@ -4417,7 +4417,7 @@ gdk_window_get_mwm_hints (GdkWindow *window)
   if (GDK_WINDOW_DESTROYED (window))
     return NULL;
 
-  display = gdk_drawable_get_display (window);
+  display = gdk_window_get_display (window);
   
   hints_atom = gdk_x11_get_xatom_by_name_for_display (display, _XA_MOTIF_WM_HINTS);
 
@@ -4448,7 +4448,7 @@ gdk_window_set_mwm_hints (GdkWindow *window,
   if (GDK_WINDOW_DESTROYED (window))
     return;
   
-  display = gdk_drawable_get_display (window);
+  display = gdk_window_get_display (window);
   
   hints_atom = gdk_x11_get_xatom_by_name_for_display (display, _XA_MOTIF_WM_HINTS);
 
@@ -5485,7 +5485,7 @@ gdk_window_set_opacity (GdkWindow *window,
       !WINDOW_IS_TOPLEVEL (window))
     return;
 
-  display = gdk_drawable_get_display (window);
+  display = gdk_window_get_display (window);
 
   if (opacity < 0)
     opacity = 0;